From: Stefan Monnier Date: Sun, 25 Oct 2009 18:09:57 +0000 (+0000) Subject: (bookmark-bmenu-list): Don't use switch-to-buffer if X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~9740 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=570a84c0ca08d170cb3d3806cef950045abd628f;p=emacs.git (bookmark-bmenu-list): Don't use switch-to-buffer if we're inside a dedicated or minibuffer window. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8021b71f656..c6a8287942c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2009-10-25 Stefan Monnier + + * bookmark.el (bookmark-bmenu-list): Don't use switch-to-buffer if + we're inside a dedicated or minibuffer window. + 2009-10-24 Karl Fogel * bookmark.el: Update documentation, especially documentation @@ -12,8 +17,8 @@ * whitespace.el (whitespace-mode, whitespace-newline-mode) (global-whitespace-mode, global-whitespace-newline-mode) - (whitespace-toggle-options, global-whitespace-toggle-options): Doc - fix (Bug#3660). + (whitespace-toggle-options, global-whitespace-toggle-options): + Doc fix (Bug#3660). * nxml/nxml-mode.el (nxml-balanced-close-start-tag): Use the value of xmltok-start before the end tag was inserted (Bug#2840). diff --git a/lisp/bookmark.el b/lisp/bookmark.el index ad715d8a21e..370f9de9cfa 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el @@ -1563,9 +1563,12 @@ The leftmost column displays a D if the bookmark is flagged for deletion, or > if it is flagged for displaying." (interactive) (bookmark-maybe-load-default-file) - (if (called-interactively-p 'interactive) - (switch-to-buffer (get-buffer-create "*Bookmark List*")) - (set-buffer (get-buffer-create "*Bookmark List*"))) + (let ((buf (get-buffer-create "*Bookmark List*"))) + (if (called-interactively-p 'interactive) + (if (or (window-dedicated-p) (window-minibuffer-p)) + (pop-to-buffer buf) + (switch-to-buffer buf)) + (set-buffer buf))) (let ((inhibit-read-only t)) (erase-buffer) (insert "% Bookmark\n- --------\n")